From: Benjamin Otte <otte@redhat.com>
Date: Sun, 12 Jun 2011 23:50:06 +0000 (+0200)
Subject: styleproperty: The default border color is the normal color
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~21036
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=abc239f444a44fb33ad42408ebc268a27a2d6b62;p=gtk%2B3.0.git

styleproperty: The default border color is the normal color
---

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 2de24a997d..09d05c8542 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1688,6 +1688,15 @@ border_image_width_default_value (GtkStyleProperties *props,
 {
 }
 
+static void
+border_color_default_value (GtkStyleProperties *props,
+                            GtkStateFlags       state,
+                            GValue             *value)
+{
+  g_value_unset (value);
+  gtk_style_properties_get_property (props, "color", state, value);
+}
+
 /*** API ***/
 
 static void
@@ -2277,11 +2286,18 @@ gtk_style_property_init (void)
                                                              "Border style",
                                                              GTK_TYPE_BORDER_STYLE,
                                                              GTK_BORDER_STYLE_NONE, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("border-color",
+  _gtk_style_property_register           (g_param_spec_boxed ("border-color",
                                                               "Border color",
                                                               "Border color",
-                                                              GDK_TYPE_RGBA, 0));
+                                                              GDK_TYPE_RGBA, 0),
+                                          0,
+                                          NULL,
+                                          NULL,
+                                          NULL,
+                                          NULL,
+                                          NULL,
+                                          border_color_default_value);
+
   gtk_style_properties_register_property (NULL,
                                           g_param_spec_boxed ("background-image",
                                                               "Background Image",